auto merge of #918 : alexcrichton/cargo/issue-912, r=brson
authorbors <bors@rust-lang.org>
Mon, 24 Nov 2014 19:14:30 +0000 (19:14 +0000)
committerbors <bors@rust-lang.org>
Mon, 24 Nov 2014 19:14:30 +0000 (19:14 +0000)
This forgot to take into account the logic from some other locations, so I added
a helper method!

Closes #912


Trivial merge